Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 15 Apr 2011 07:48:51 +0000 (00:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 15 Apr 2011 07:48:51 +0000 (00:48 -0700)
commitb27ab946136148dd9b3dda5f6a9a173f71a6b0d0
tree09df8d889c20b727261a6058191e66ea077274c1
parent4c402233154ab4ac952b23e692f21c376b1308ec
parentedcf73c07cecdaa1986c834547aebf9230d4779d
Merge from mainline.
src/ChangeLog
src/lisp.h
src/process.c
src/sound.c
src/sysdep.c